Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl: do not unset involving schema on EntryTooLarge error #51963

Merged
merged 1 commit into from
Mar 21, 2024

Conversation

tangenta
Copy link
Contributor

@tangenta tangenta commented Mar 20, 2024

What problem does this PR solve?

Issue Number: close #51962

Problem Summary:

tidb/pkg/ddl/ddl_worker.go

Lines 544 to 565 in 274d5e2

func (w *worker) handleUpdateJobError(t *meta.Meta, job *model.Job, err error) error {
if err == nil {
return nil
}
if kv.ErrEntryTooLarge.Equal(err) {
w.jobLogger(job).Warn("update DDL job failed", zap.String("job", job.String()), zap.Error(err))
w.sess.Rollback()
err1 := w.sess.Begin()
if err1 != nil {
return errors.Trace(err1)
}
// Reduce this txn entry size.
job.BinlogInfo.Clean()
job.InvolvingSchemaInfo = nil
job.Error = toTError(err)
job.ErrorCount++
job.SchemaState = model.StateNone
job.State = model.JobStateCancelled
err = w.finishDDLJob(t, job)
}
return errors.Trace(err)
}

We should not set job.InvolvingSchemaInfo to nil even if this txn size is too large, because we need this field to "unblock" other DDLs that change the same schemas/tables.

What changed and how does it work?

See 'Files Changed'.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 20, 2024
Copy link

tiprow bot commented Mar 20, 2024

Hi @tangenta. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tangenta tangenta added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.0 labels Mar 20, 2024
Copy link

codecov bot commented Mar 20, 2024

Codecov Report

Merging #51963 (14419c2) into master (f676a1a) will decrease coverage by 17.7790%.
Report is 2 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #51963         +/-   ##
=================================================
- Coverage   72.4290%   54.6501%   -17.7790%     
=================================================
  Files          1477       1588        +111     
  Lines        365022     608921     +243899     
=================================================
+ Hits         264382     332776      +68394     
- Misses        81124     252943     +171819     
- Partials      19516      23202       +3686     
Flag Coverage Δ
integration 36.7353% <ø> (?)
unit 70.4654% <ø> (-1.8394%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9957% <ø> (-2.3014%) ⬇️
parser ∅ <ø> (∅)
br 51.1966% <ø> (+4.8909%) ⬆️

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 21, 2024
Copy link

ti-chi-bot bot commented Mar 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ywqzzy, zimulala

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 21, 2024
Copy link

ti-chi-bot bot commented Mar 21, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-21 02:16:22.293436726 +0000 UTC m=+1515809.315683112: ☑️ agreed by zimulala.
  • 2024-03-21 03:06:12.901899468 +0000 UTC m=+1518799.924145856: ☑️ agreed by ywqzzy.

@tangenta
Copy link
Contributor Author

/retest

Copy link

tiprow bot commented Mar 21, 2024

@tangenta: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot merged commit 2b4134a into pingcap:master Mar 21, 2024
23 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #51964.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Mar 21, 2024
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Mar 21, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #51965.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #51966.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.0: #51967.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.0 release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kv.ErrEntryTooLarge may block DDL forever
4 participants